From ad195de617900474639126835a297c1aef6ac199 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 4 May 2010 09:35:18 +0100 Subject: [PATCH] Remus: include device name in vif objects Signed-off-by: Brendan Cully --- tools/python/xen/remus/vif.py | 8 ++++++-- tools/python/xen/remus/vm.py | 8 +++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/tools/python/xen/remus/vif.py b/tools/python/xen/remus/vif.py index 2022f16eae..d14d54b14f 100644 --- a/tools/python/xen/remus/vif.py +++ b/tools/python/xen/remus/vif.py @@ -2,6 +2,7 @@ from xen.remus.util import canonifymac class VIF(object): def __init__(self, **props): + self.dev = 'unknown' self.__dict__.update(props) if 'mac' in props: self.mac = canonifymac(props['mac']) @@ -9,6 +10,9 @@ class VIF(object): def __str__(self): return self.mac -def parse(props): +def parse(props, domid, index): "turn a vm device dictionary into a vif object" - return VIF(**props) + vif = VIF(**props) + vif.dev = 'vif%d.%d' % (domid, index) + + return vif diff --git a/tools/python/xen/remus/vm.py b/tools/python/xen/remus/vm.py index ae4d260a26..90002e3f21 100644 --- a/tools/python/xen/remus/vm.py +++ b/tools/python/xen/remus/vm.py @@ -113,7 +113,13 @@ def getvifs(dom): if type(vifs) != list: vifs = [vifs] - return [vif.parse(v) for v in vifs] + vifno = 0 + parsed = [] + for v in vifs: + parsed.append(vif.parse(v, dom['domid'], vifno)) + vifno += 1 + + return parsed def getdisks(dom): "return block device objects for devices in dom" -- 2.30.2